Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ERT rework #123

Closed
wants to merge 12 commits into from
Closed

ERT rework #123

wants to merge 12 commits into from

Conversation

Ratyyy
Copy link
Collaborator

@Ratyyy Ratyyy commented Jul 9, 2024

Описание PR

полный реворк обр
Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑

  • add: Добавлено веселье!
  • remove: Убрано веселье!
  • tweak: Изменено веселье!
  • fix: Исправлено веселье!

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации labels Jul 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 9, 2024 •
edited
Loading

RSI Diff Bot; head commit 50dc7a3 merging into 907b4fa
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Back/Duffels/syndicate.rsi

State Old New Status
ammo-equipped-BACKPACK Modified
equipped-BACKPACK Modified
icon-ammo Modified
icon-med Modified
icon Modified
inhand-left Modified
inhand-right Modified
med-equipped-BACKPACK Modified

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi

State Old New Status
icon Modified
icon-flash Removed
off-equipped-HELMET Removed
on-equipped-HELMET-vox Removed
on-equipped-HELMET Removed
equipped-HELMET-light Added
equipped-HELMET-unshaded Added
equipped-HELMET-vulp Added
equipped-HELMET Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi

State Old New Status
icon Modified
icon-flash Removed
off-equipped-HELMET Removed
on-equipped-HELMET-vox Removed
on-equipped-HELMET Removed
equipped-HELMET-light Added
equipped-HELMET-unshaded Added
equipped-HELMET-vulp Added
equipped-HELMET Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi

State Old New Status
icon Modified
icon-flash Removed
off-equipped-HELMET-vox Removed
off-equipped-HELMET Removed
on-equipped-HELMET-vox Removed
on-equipped-HELMET Removed
equipped-HELMET-light Added
equipped-HELMET-unshaded Added
equipped-HELMET-vox Added
equipped-HELMET-vulp Added
equipped-HELMET Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi

State Old New Status
icon Modified
icon-flash Removed
off-equipped-HELMET-vox Removed
off-equipped-HELMET Removed
on-equipped-HELMET-vox Removed
on-equipped-HELMET Removed
equipped-HELMET-light Added
equipped-HELMET-unshaded Added
equipped-HELMET-vox Added
equipped-HELMET-vulp Added
equipped-HELMET Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi

State Old New Status
icon Modified
icon-flash Removed
off-equipped-HELMET-vox Removed
off-equipped-HELMET Removed
on-equipped-HELMET-vox Removed
on-equipped-HELMET Removed
equipped-HELMET-light Added
equipped-HELMET-unshaded Added
equipped-HELMET-vox Added
equipped-HELMET-vulp Added
equipped-HELMET Added

Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
on-equipped-HELMET-vox Modified
on-equipped-HELMET Modified

Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
on-equipped-HELMET Modified

Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
on-equipped-HELMET Modified

Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
on-equipped-HELMET Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Modified
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/ADT/Clothing/Head/Hardsuits/riotert.rsi

State Old New Status
equipped-HELMET-vulp Added
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Shoes/Boots/magboots-ert.rsi

State Old New Status
equipped-FEET Added
icon-on Added
icon Added
inhand-left Added
inhand-right Added
on-equipped-FEET Added
on-inhand-left Added
on-inhand-right Added

Resources/Textures/ADT/Objects/Specific/bobert.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Objects/Specific/tradeunit.rsi

State Old New Status
inhand-left Added
inhand-right Added
tradeunit Added

Resources/Textures/ADT/Objects/Storage/weaponcase.rsi

State Old New Status
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ion_rifle.rsi

State Old New Status
base Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/deser_eagle.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Edit: diff updated after 50dc7a3

@github-actions github-actions bot added the Changes: Map Изменение карт label Jul 9, 2024
@1Stepka1
Copy link
Collaborator

1Stepka1 commented Jul 10, 2024 •
edited
Loading

Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml поменять название файла на Magboots.yml
Resources/Prototypes/ADT/Entities/Objects/Specific/Storage/weaponcase.yml раз в нем так много storagefill предлагаю перенести его в а именно в Resources/Prototypes/ADT/Catalog/Fills/Items/WeaponCase.yml
Resources/Prototypes/ADT/Entities/Objects/Specific/bober.yml все type: listing в Resources\Prototypes\ADT\Catalog там категорию создать под это чудо устройство и туда запихнуть все type: listing
Resources/Prototypes/ADT/Entities/Objects/Specific/uplink_ERT.yml все - type: storeCategory в Resources/Prototypes/ADT/Store/categories.yml
Resources/Prototypes/ADT/Roles/Jobs/Fun/emergenctresponceteam.yml если не трудно сгруппировать job и startingGear по порядку(роль и ниже её startingGear)
Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml лучше по аналогии перенести к ADTClothingShoesBootsMagERT
Остальное вроде нормально, жалобы тестов самой разумеющие пофиксить

@Ratyyy
Copy link
Collaborator Author

Ratyyy commented Jul 10, 2024

Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml поменять название файла на Magboots.yml Resources/Prototypes/ADT/Entities/Objects/Specific/Storage/weaponcase.yml раз в нем так много storagefill предлагаю перенести его в а именно в Resources/Prototypes/ADT/Catalog/Fills/Items/WeaponCase.yml Resources/Prototypes/ADT/Entities/Objects/Specific/bober.yml все type: listing в Resources\Prototypes\ADT\Catalog там категорию создать под это чудо устройство и туда запихнуть все type: listing Resources/Prototypes/ADT/Entities/Objects/Specific/uplink_ERT.yml все - type: storeCategory в Resources/Prototypes/ADT/Store/categories.yml Resources/Prototypes/ADT/Roles/Jobs/Fun/emergenctresponceteam.yml если не трудно сгруппировать job и startingGear по порядку(роль и ниже её startingGear) Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml лучше по аналогии перенести к ADTClothingShoesBootsMagERT Остальное вроде нормально, жалобы тестов самой разумеющие пофиксить

хорошо, но первое слегка не правильное, там должен быть полный файл со всеми ботинками с ADT, а не только магботы обр

@1Stepka1
Copy link
Collaborator

1Stepka1 commented Jul 10, 2024 •
edited
Loading

У нас есть ещё какие-то магнитные ботинки, так что на будущее это, действие их в тот же файл с ботинками вписать
Других ботинок которые могли бы добавится в boots в ветке нету

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Changes: UI Изменение интерфейса label Jul 19, 2024
1Stepka1
1Stepka1 reviewed Jul 19, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Мне кажется в эту ветку попало много чего лишнего

@Ratyyy
Copy link
Collaborator Author

Ratyyy commented Jul 19, 2024

Мне кажется в эту ветку попало много чего лишнего

видимо, я на столько сильно всё сломала, что надо пересоздавать всю ветку

@Ratyyy Ratyyy closed this Jul 19, 2024
@Schrodinger71 Schrodinger71 deleted the ERT-update branch August 11, 2024 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1Stepka1 1Stepka1 1Stepka1 left review comments

Assignees

@1Stepka1 1Stepka1

@Ratyyy Ratyyy

Labels
Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Ratyyy @1Stepka1